Merge branch 'xnext/zynqmp' of git://www.denx.de/git/u-boot-microblaze

author Tom Rini <[email protected]>

Mon, 2 Mar 2015 18:22:12 +0000 (13:22 -0500)

committer Tom Rini <[email protected]>

Mon, 2 Mar 2015 18:22:12 +0000 (13:22 -0500)
author Tom Rini <[email protected]>
Mon, 2 Mar 2015 18:22:12 +0000 (13:22 -0500)
committer Tom Rini <[email protected]>
Mon, 2 Mar 2015 18:22:12 +0000 (13:22 -0500)
diff --cc MAINTAINERS
Simple merge
diff --cc arch/arm/Kconfig
Simple merge
author	Tom Rini <[email protected]>
	Mon, 2 Mar 2015 18:22:12 +0000 (13:22 -0500)
committer	Tom Rini <[email protected]>
	Mon, 2 Mar 2015 18:22:12 +0000 (13:22 -0500)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history